bitkeeper revision 1.1015 (40daefb7Yxmwg11WTNOJcj2lzrnQcA)

trivial

diff --cc linux-2.4.26-xen-sparse/arch/xen/Makefile
index 705dc41a9b60992a7d9075ca4ad621292b2057cc,44fe201bc5891f43862ed795fa847b9027938ee5..a92009805dc48568ca4d75a35845d7a7a74197d0
--- 1/linux-2.4.26-xen-sparse/arch/xen/Makefile
--- 2/linux-2.4.26-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.26-xen-sparse/arch/xen/Makefile
@@@ -16,16 -16,12 +16,12 @@@
  #           Added '-march' and '-mpreferred-stack-boundary' support
  #
  
- override EXTRAVERSION := $(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION)
+ override EXTRAVERSION:=$(subst linux-$(VERSION).$(PATCHLEVEL).$(SUBLEVEL),,$(shell basename $(TOPDIR)))$(EXTRAVERSION)
  
- # This following is pretty horrid, but I think the ends justify the
- # means: if no .config file exists copy the appropriate defconfig-XXX
- # file to .config so that we use it in preference to the plain
- # defconfig file. It would be much better if there was a hook in the
- # main Makefile to do this, but this works.
+ # If no .config file exists then use the appropriate defconfig-* file
  ifneq (.config,$(wildcard .config))
- X=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config)
 -X:=$(shell cp arch/xen/defconfig$(EXTRAVERSION) .config 2>/dev/null)
 --include .config
++DUMMYX:=$(shell cp $(TOPDIR)/arch/xen/defconfig$(EXTRAVERSION) $(TOPDIR)/.config)
 +-include $(TOPDIR)/.config
  endif
  
  LD=$(CROSS_COMPILE)ld -m elf_i386